Merge tag 'upstream/3.4'

Upstream version 3.4

# gpg: Signature made Tue 14 Apr 2015 22:58:57 CEST
# gpg:                using RSA key 2FF9CD59612616B5
# gpg: please do a --check-trustdb
# gpg: Good signature from "Axel Beckert <abe@deuxchevaux.org>"
# gpg:                 aka "Axel Beckert (E-Mail + Jabber) <abe@noone.org>"
# gpg:                 aka "Axel Beckert (Symlink) <xtaran@symlink.ch>"
# gpg:                 aka "[jpeg image of size 3155]"
# gpg:                 aka "Axel Stefan Beckert"
# gpg:                 aka "Axel Beckert (FSFE Fellow) <abe@fsfe.org>"
# gpg:                 aka "Axel Beckert (Debian Developer) <abe@debian.org>"