Fix travis CI error
Merge branch 'develop'