Merge branch 'hotfix/1.2.49' v1.2.49
authorLaury GvR <laury@gaslightmedia.com>
Mon, 19 Nov 2018 19:39:58 +0000 (14:39 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 19 Nov 2018 19:39:58 +0000 (14:39 -0500)

Trivial merge