merged in from code from the other master

Benjamin Mako Hill || Want to submit a patch?