Merge branch 'develop'
1.7.1 version bump
Merge branch 'develop'
Moving version around
Merge branch 'master' into develop