Merge branch 'hotfix/2.10.47' v2.10.47
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 10 Jan 2019 19:07:04 +0000 (14:07 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 10 Jan 2019 19:07:04 +0000 (14:07 -0500)

Trivial merge