Merge branch 'hotfix/2.4.6' v2.4.6
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 5 Jan 2018 18:21:40 +0000 (13:21 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 5 Jan 2018 18:21:40 +0000 (13:21 -0500)

Trivial merge