Merge remote branch 'deployment/live' into live

Benjamin Mako Hill || Want to submit a patch?