Merge branch 'hotfix/1.0.18' v1.0.18
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 27 Jul 2018 12:12:40 +0000 (08:12 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 27 Jul 2018 12:12:40 +0000 (08:12 -0400)

Trivial merge