Merge branch 'master' into develop
Merge branch 'develop' into v1.0
final cleanup, ready for submission
Merge branch 'v1.0' into develop
Merge branch 'develop'