Merge branch 'hotfix/1.0.49' v1.0.49
authorLaury GvR <laury@gaslightmedia.com>
Fri, 1 Dec 2017 18:39:46 +0000 (13:39 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 1 Dec 2017 18:39:46 +0000 (13:39 -0500)

Trivial merge