merge patched-unstable into unstable

Benjamin Mako Hill || Want to submit a patch?