Merge branch 'hotfix/1.0.18' v1.0.18
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 21 Mar 2018 17:46:02 +0000 (13:46 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 21 Mar 2018 17:46:02 +0000 (13:46 -0400)

Trivial merge