Merge branch 'hotfix/1.0.15' v1.0.15
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 16 Mar 2018 19:00:32 +0000 (15:00 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 16 Mar 2018 19:00:32 +0000 (15:00 -0400)

Trivial merge