Imported Upstream version 0.20.6
Merge tag 'upstream/0.20.6'

Upstream version 0.20.6

# gpg: Signature made Fri 18 Jul 2014 08:03:21 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.6':
  Imported Upstream version 0.20.6