Merge branch 'master' into develop
minor cleanup and build commit
Merge branch 'develop' into release-0.3.14
Merge branch 'release-0.3.14'