merge patched into master

Benjamin Mako Hill || Want to submit a patch?