Merge tag 'upstream/4.05.0_rc1' into debian/experimental

Upstream version 4.05.0~rc1

# gpg: Signature made Tue 04 Jul 2017 18:21:11 CEST
# gpg:                using RSA key 3667486A326DB2766D255546860DEF3B8F650B79
# 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]