Merge branch 'hotfix/1.0.18' v1.0.18
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Jun 2018 12:16:37 +0000 (08:16 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Jun 2018 12:16:37 +0000 (08:16 -0400)

Trivial merge