A bunch of upstream deployments, mostly around notifications
Merge branch 'master' into 2014-skin