travis update 1.1.1
fixed travis
Merge remote-tracking branch 'upstream/master'
upstream