Merge branch 'hotfix/1.2.47' v1.2.47
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 21 Dec 2018 17:49:13 +0000 (12:49 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 21 Dec 2018 17:49:13 +0000 (12:49 -0500)

Trivial merge