Merge branch 'hotfix/1.0.22' v1.0.22
authorLaury GvR <laury@gaslightmedia.com>
Wed, 25 Oct 2017 20:19:33 +0000 (16:19 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 25 Oct 2017 20:19:33 +0000 (16:19 -0400)

Trivial merge