Merge branch 'hotfix/1.0.26' v1.0.26
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 17 May 2017 19:43:18 +0000 (15:43 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 17 May 2017 19:43:18 +0000 (15:43 -0400)

Trivial merge