Merge branch 'hotfix/1.5.24' v1.5.24
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 7 Nov 2018 17:40:20 +0000 (12:40 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 7 Nov 2018 17:40:20 +0000 (12:40 -0500)

Trivial merge