Merge branch 'hotfix/1.0.15' v1.0.15
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 5 Apr 2018 16:05:20 +0000 (12:05 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 5 Apr 2018 16:05:20 +0000 (12:05 -0400)

Trivial merge