Attempt to fix Travis
Merge pull request #5106 from timvandermeij/travis-fix

Attempt to fix Travis