Merge branch 'hotfix/1.2.48' v1.2.48
authorLaury GvR <laury@gaslightmedia.com>
Fri, 16 Nov 2018 15:15:01 +0000 (10:15 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 16 Nov 2018 15:15:01 +0000 (10:15 -0500)

Trivial merge