Fix travis setting
Merge remote-tracking branch 'upstream2/master'