Update for 2012-11-12

Benjamin Mako Hill || Want to submit a patch?