Merge branch 'develop'
Merge branch 'master' into develop
Bump to 0.0.1.5-SNAPSHOT