Merge branch 'master' of /git/bmh-cv

Benjamin Mako Hill || Want to submit a patch?