Update upstream source from tag 'upstream/2018.04.16'
authorDon Armstrong <don@donarmstrong.com>
Tue, 24 Apr 2018 23:07:45 +0000 (16:07 -0700)
committerDon Armstrong <don@donarmstrong.com>
Tue, 24 Apr 2018 23:07:45 +0000 (16:07 -0700)
Update to upstream version '2018.04.16'
with Debian dir 9954beef4e980f6968367594b0b1ce462a4bb463


Trivial merge