Merge remote branch 'upstream/master'

Benjamin Mako Hill || Want to submit a patch?