set DISPLAY without breaking everything
Merge branch 'fix/broken-travis-tests-2' into develop