Updated version 2017.08.24 from 'upstream/2017.08.24'
authorDon Armstrong <don@donarmstrong.com>
Fri, 20 Oct 2017 20:27:22 +0000 (13:27 -0700)
committerDon Armstrong <don@donarmstrong.com>
Fri, 20 Oct 2017 20:27:22 +0000 (13:27 -0700)
with Debian dir a4323abf636efe131a7e2501a3461d66ca2995c4


Trivial merge