Merge branch 'hotfix/2.10.24' v2.10.24
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 20 Feb 2018 18:59:10 +0000 (13:59 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 20 Feb 2018 18:59:10 +0000 (13:59 -0500)

Trivial merge