Trigger a travis re-build
Auto-merge remote-tracking branch 'upstream/master'