Imported Upstream version 0.20.1
Merge tag 'upstream/0.20.1'

Upstream version 0.20.1

# gpg: Signature made Mon 24 Feb 2014 10:02:13 PM CET 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.1':
  Imported Upstream version 0.20.1