Merge branches 'master' and 'master' of ssh+git://volo/var/www/leastsquares

Benjamin Mako Hill || Want to submit a patch?