Merge remote branch 'remotes/deployment/master' into live

Benjamin Mako Hill || Want to submit a patch?