Merge branch 'hotfix/1.0.18' v1.0.18
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 29 Apr 2019 17:18:24 +0000 (13:18 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 29 Apr 2019 17:18:24 +0000 (13:18 -0400)

Trivial merge