merged changes back from the production version

Benjamin Mako Hill || Want to submit a patch?