merge
authorWilliam Deegan <bill@baddogconsulting.com>
Thu, 15 Jun 2017 01:21:38 +0000 (18:21 -0700)
committerWilliam Deegan <bill@baddogconsulting.com>
Thu, 15 Jun 2017 01:21:38 +0000 (18:21 -0700)

Trivial merge