Merge branch 'ls/travis-build-doc' into maint