Merge branch 'hotfix/1.0.18' v1.0.18
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 11 Sep 2018 20:43:27 +0000 (16:43 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 11 Sep 2018 20:43:27 +0000 (16:43 -0400)

Trivial merge