Merge branch 'hotfix/2.10.26' v2.10.26
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 8 Mar 2018 21:12:40 +0000 (16:12 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 8 Mar 2018 21:12:40 +0000 (16:12 -0500)

Trivial merge