This should fix the travis-ci build
Merge remote-tracking branch 'origin/master' into file-transfers