Merge "Make sure asciidoc uses unix line endings in generated HTML."