update from release branch
authorWilliam Deegan <bill@baddogconsulting.com>
Mon, 18 Sep 2017 20:48:45 +0000 (16:48 -0400)
committerWilliam Deegan <bill@baddogconsulting.com>
Mon, 18 Sep 2017 20:48:45 +0000 (16:48 -0400)

Trivial merge