Merge tag 'upstream/3.3'

Upstream version 3.3

# gpg: Signature made Mon 22 Sep 2014 10:51:39 PM CEST using DSA key ID 95930EDE
# gpg: please do a --check-trustdb
# gpg: Good signature from "Axel Beckert (no legal relevance) <abe@deuxchevaux.org>"
# gpg:                 aka "Axel Beckert (no legal relevance) <abe@noone.org>"
# gpg:                 aka "Axel Beckert (no legal relevance) <xtaran@symlink.ch>"
# gpg:                 aka "Axel Beckert (FSFE Fellow) <abe@fsfe.org>"
# gpg:                 aka "Axel Beckert (Debian Developer) <abe@debian.org>"