Imported Upstream version 0.20.4
Merge tag 'upstream/0.20.4'

Upstream version 0.20.4

# gpg: Signature made Thu 03 Jul 2014 07:54:00 PM CEST using RSA key ID 016CFFD0
# gpg: Good signature from "Jonas Genannt <jonas@brachium-system.net>"
# gpg:                 aka "Jonas Genannt <jonas.genannt@capi2name.de>"

* tag 'upstream/0.20.4':
  Imported Upstream version 0.20.4