Merge branch 'hotfix/1.0.22' v1.0.22
authorLaury GvR <laury@gaslightmedia.com>
Thu, 15 Nov 2018 20:10:15 +0000 (15:10 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 15 Nov 2018 20:10:15 +0000 (15:10 -0500)

Trivial merge