Conflicts
Merge branch 'master' into version-0.6
Merge branch 'version-0.6' of https://github.com/clearsightstudio/ProMotion into version-0.6
Merge branch 'version-0.6'