Merge branch 'master' into develop
Well deserved upgrades.
Merge branch 'develop'