Merge branch 'hotfix/1.0.26' v1.0.26
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 9 May 2016 19:03:46 +0000 (15:03 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 9 May 2016 19:03:46 +0000 (15:03 -0400)

Trivial merge