Merge branch 'hotfix/1.0.17' v1.0.17
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 20 Mar 2018 12:44:49 +0000 (08:44 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 20 Mar 2018 12:44:49 +0000 (08:44 -0400)

Trivial merge