Updated version 4.05.0 from 'upstream/4.05.0'
authorXimin Luo <infinity0@debian.org>
Fri, 14 Jul 2017 12:03:12 +0000 (14:03 +0200)
committerXimin Luo <infinity0@debian.org>
Fri, 14 Jul 2017 12:03:12 +0000 (14:03 +0200)
with Debian dir c844517dc96c16122fa8f074fd6dfbc03830ccab


Trivial merge