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:51:25 PM CEST using RSA key ID 016CFFD0
# gpg: checking the trustdb
# gpg: 3 marginal(s) needed, 1 complete(s) needed, classic trust model
# gpg: depth: 0  valid:   2  signed:  13  trust: 0-, 0q, 0n, 0m, 0f, 2u
# gpg: depth: 1  valid:  13  signed:  11  trust: 13-, 0q, 0n, 0m, 0f, 0u
# 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