Merge branch 'hotfix/1.0.24' v1.0.24
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 29 May 2018 16:47:58 +0000 (12:47 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 29 May 2018 16:47:58 +0000 (12:47 -0400)

Trivial merge