Merge branch 'hotfix/#MW1'
…
Merge branch 'hotfix/travis3' into develop