Merge branch 'hotfix/1.0.17' v1.0.17
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 11 Apr 2018 17:19:56 +0000 (13:19 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 11 Apr 2018 17:19:56 +0000 (13:19 -0400)

Trivial merge