Merge branch 'hotfix/1.0.17' master v1.0.17
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 11 Oct 2019 16:26:16 +0000 (12:26 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 11 Oct 2019 16:26:16 +0000 (12:26 -0400)

Trivial merge