Merge branch 'hotfix/2.0.22' v2.0.22
authorLaury GvR <laury@gaslightmedia.com>
Thu, 31 May 2018 13:57:16 +0000 (09:57 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 31 May 2018 13:57:16 +0000 (09:57 -0400)

Trivial merge