Merge branch 'hotfix/1.0.15' v1.0.15
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 26 Jun 2018 19:46:01 +0000 (15:46 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 26 Jun 2018 19:46:01 +0000 (15:46 -0400)

Trivial merge