try to speed up Travis a bit ;)
Merge remote-tracking branch 'origin/master'