Merge branch 'hotfix/1.0.15' v1.0.15
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 8 Jan 2016 22:25:26 +0000 (17:25 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 8 Jan 2016 22:25:26 +0000 (17:25 -0500)

Trivial merge