Merge branch 'hotfix/1.0.15' v1.0.15
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 12 Jul 2018 19:40:28 +0000 (15:40 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 12 Jul 2018 19:40:28 +0000 (15:40 -0400)

Trivial merge