Merge branch 'develop'
Setting version to 0.1.6
Setting version to 0.1.7-SNAPSHOT
Merge branch 'master' into develop