Merge branch 'hotfix/1.0.17' v1.0.17
authorChuck Scott <cscott@gaslightmedia.com>
Mon, 10 Sep 2018 20:48:49 +0000 (16:48 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Mon, 10 Sep 2018 20:48:49 +0000 (16:48 -0400)

Trivial merge