Merge from head -- breakage

Benjamin Mako Hill || Want to submit a patch?