Merge branch 'hotfix/1.0.17' v1.0.17
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 7 Sep 2018 16:58:50 +0000 (12:58 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 7 Sep 2018 16:58:50 +0000 (12:58 -0400)

Trivial merge