fix travis (I hope :confused:)
fix travis?
Merge remote-tracking branch 'upstream/master'