merge
authorWilliam Deegan <bill@baddogconsulting.com>
Tue, 1 Aug 2017 20:34:13 +0000 (13:34 -0700)
committerWilliam Deegan <bill@baddogconsulting.com>
Tue, 1 Aug 2017 20:34:13 +0000 (13:34 -0700)

Trivial merge