Bugfix due to a merge with master
Merge branch 'junit' of https://github.com/xplodwild/Atlantis into junit