Merge branch 'hotfix/1.0.22' v1.0.22
authorLaury GvR <laury@gaslightmedia.com>
Thu, 28 Jun 2018 20:20:02 +0000 (16:20 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 28 Jun 2018 20:20:02 +0000 (16:20 -0400)

Trivial merge