Merge branch 'release/1.0.26' v1.0.26
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 26 Sep 2018 17:24:08 +0000 (13:24 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 26 Sep 2018 17:24:08 +0000 (13:24 -0400)

Trivial merge