Merge branch 'hotfix/1.0.15' v1.0.15
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 11 Oct 2017 13:24:57 +0000 (09:24 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 11 Oct 2017 13:24:57 +0000 (09:24 -0400)

Trivial merge