Try to fix timing issues in Travis
Merge branch 'master' into 1.x