Merge branch 'master' into staging
Dammit php...
Merge branch 'staging'