zomg there was a test for that
Merge branch 'develop' into otter