Merge branch 'hotfix/1.0.18' v1.0.18
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 4 Dec 2018 16:01:34 +0000 (11:01 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 4 Dec 2018 16:01:34 +0000 (11:01 -0500)

Trivial merge