Merge branch 'master' into develop
incrementing to new dev version
updating emom version, adding a touch of concurrency
incrementing to version 1.2
Merge branch 'release-1.2'