Fix typo
Merge branch 'master' into develop
Update travis settings
Merge branch 'master' into develop