Update upstream source from tag 'upstream/2.0.9.4'
authorYanhao Mo <yanhaocs@gmail.com>
Sun, 14 Oct 2018 11:35:28 +0000 (19:35 +0800)
committerYanhao Mo <yanhaocs@gmail.com>
Sun, 14 Oct 2018 11:35:28 +0000 (19:35 +0800)
Update to upstream version '2.0.9.4'
with Debian dir b3b01b3176ac36cce12bb3e5028a1068da1e416e


Trivial merge