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