Fix build on Travis CI
Merge branch 'origin/master'