Merge branch 'hotfix/1.0.15' v1.0.15
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 14 Oct 2016 13:49:44 +0000 (09:49 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 14 Oct 2016 13:49:44 +0000 (09:49 -0400)

Trivial merge