Imported Upstream version 0.20.2
Merge tag 'upstream/0.20.2'

Upstream version 0.20.2

# gpg: Signature made Sat 24 May 2014 03:56:26 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.2':
  Imported Upstream version 0.20.2