Merge branch 'hotfix/Travis'
fix travis errors
Merge branch 'hotfix/TravisFix' into develop