Merge branch 'hotfix/1.0.15' v1.0.15
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 24 Jun 2016 15:28:11 +0000 (11:28 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 24 Jun 2016 15:28:11 +0000 (11:28 -0400)

Trivial merge