Merge branch 'hotfix/1.2.48' v1.2.48
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 28 Jan 2019 14:54:05 +0000 (09:54 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 28 Jan 2019 14:54:05 +0000 (09:54 -0500)

Trivial merge