Merge branch 'master' into develop
when will they stick with a sane package name?
silly Google
Merge branch 'develop'