Merge branch 'develop'
Bump version
Fix navigation tests