Merge branch 'hotfix/1.0.22' v1.0.22
authorLaury GvR <laury@gaslightmedia.com>
Mon, 27 Nov 2017 20:44:47 +0000 (15:44 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 27 Nov 2017 20:44:47 +0000 (15:44 -0500)

Trivial merge