Merge branch 'ls/travis-doc-asciidoctor'