Merge branch 'release/1.5.26' v1.5.26
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 19 Dec 2018 21:32:24 +0000 (16:32 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 19 Dec 2018 21:32:24 +0000 (16:32 -0500)

Trivial merge