Merge branch 'hotfix/1.0.26' v1.0.26
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 19 Oct 2018 18:50:57 +0000 (14:50 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 19 Oct 2018 18:50:57 +0000 (14:50 -0400)

Trivial merge