merge
authorWilliam Deegan <bill@baddogconsulting.com>
Mon, 31 Jul 2017 04:33:24 +0000 (21:33 -0700)
committerWilliam Deegan <bill@baddogconsulting.com>
Mon, 31 Jul 2017 04:33:24 +0000 (21:33 -0700)

Trivial merge