Ping the travis CI
Merge remote-tracking branch 'upstream/master'