Revert to 56e05fced
Revert to
modify travis settings
Merge remote-tracking branch 'origin/master'