Merge branch 'hotfix/travisfix'
trash fix
Merge branch 'hotfix/trashfix' into develop