reverting travis-ci change
Merge branch 'develop'