Merge branch 'upstream'

Benjamin Mako Hill || Want to submit a patch?