For Travis CI - complete the last branching with a true command.
Merge remote-tracking branch 'upstream/master'