Updates from the cmapi 1.3.0 repo
Merge branch 'master' into development