Merge branch 'release/1.0.22' v1.0.22
authorLaury GvR <laury@gaslightmedia.com>
Wed, 2 May 2018 19:07:08 +0000 (15:07 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 2 May 2018 19:07:08 +0000 (15:07 -0400)

Trivial merge