move back to original branch
make .travis.yml work unchanged on OS X
Merge branch '52-latex' into 52-latex-osx