Merge branch 'hotfix/1.0.22' v1.0.22
authorLaury GvR <laury@gaslightmedia.com>
Wed, 30 Aug 2017 13:19:01 +0000 (09:19 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 30 Aug 2017 13:19:01 +0000 (09:19 -0400)

Trivial merge