locally this doesnt work, but on travis-ci it does...
Merge branch 'testsetup' into develop