Travis: fix directory name
Merge branch 'master' into macosx.travis