Merge branch 'hotfix/1.1.15' v1.1.15
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 3 Aug 2017 17:08:52 +0000 (13:08 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 3 Aug 2017 17:08:52 +0000 (13:08 -0400)

Trivial merge