Merge branch 'hotfix/1394230516-travis'
Edit .travis.yml
Merge branch 'hotfix/1394231112-travis' into develop