Merge tag 'upstream/1.11.0+dfsg1'

Upstream version 1.11.0+dfsg1

# gpg: Signature made Mon 22 Aug 2016 23:21:51 CEST
# gpg:                using RSA key 860DEF3B8F650B79
# gpg: Good signature from "Ximin Luo <infinity0@pwned.gg>" [ultimate]
# gpg:                 aka "Ximin Luo <infinity0@torproject.org>" [ultimate]
# gpg:                 aka "Ximin Luo <infinity0@freenetproject.org>" [ultimate]
# gpg:                 aka "Ximin Luo <infinity0@debian.org>" [ultimate]
# gpg:                 aka "Satoshi Nakamoto (www.bitcoin.org) <satoshin@gmx.com>" [ultimate]