comment sauce in travis until we know why it fails on prs
Merge remote-tracking branch 'upstream/master'