Merge branch 'hotfix/1.0.15' v1.0.15
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 2 Nov 2016 15:41:20 +0000 (11:41 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 2 Nov 2016 15:41:20 +0000 (11:41 -0400)

Trivial merge