Fix for #408
Merge pull request #418 from akvo/annamarthe-408

Fix for #408
Merge branch 'develop' into feature/navigation_tests