Merge branch 'hotfix/1.0.26' v1.0.26
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 31 Mar 2016 18:27:00 +0000 (14:27 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 31 Mar 2016 18:27:00 +0000 (14:27 -0400)

Trivial merge