Merge tag 'upstream/2.1.1'

Upstream version 2.1.1

# gpg: Signature made Mon 02 Jun 2014 01:21:54 CEST using RSA key ID D729A457
# gpg: Good signature from "Jelmer Vernooij <jelmer@samba.org>"
# gpg:                 aka "Jelmer Vernooij <jelmer@sernet.de>"
# gpg:                 aka "Jelmer Vernooij <jelmer@apache.org>"
# gpg:                 aka "Jelmer Vernooij <jelmer@debian.org>"
# gpg:                 aka "Jelmer Vernooij <jelmer@ubuntu.com>"
# gpg:                 aka "Jelmer Vernooij <jelmer@vernstok.nl>"
# gpg:                 aka "Jelmer Vernooij <jelmer@openchange.org>"
# gpg:                 aka "Jelmer Vernooij <jrvernooij@tigris.org>"
# gpg:                 aka "Jelmer Vernooij <jelmer@jelmer.co.uk>"
# gpg:                 aka "Jelmer Vernooij <jelmer@jelmer.co.uk>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: DC83 7EE1 4A7E 3734 7E87  0617 0080 6F2B D729 A457