Merge from my devel branch

Benjamin Mako Hill || Want to submit a patch?