Merge branch 'hotfix/1.2.26' v1.2.26
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 28 Feb 2018 14:58:12 +0000 (09:58 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 28 Feb 2018 14:58:12 +0000 (09:58 -0500)

Trivial merge