Merge branch 'release/1.0.22' v1.0.22
authorLaury GvR <laury@gaslightmedia.com>
Tue, 14 Nov 2017 21:49:41 +0000 (16:49 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 14 Nov 2017 21:49:41 +0000 (16:49 -0500)

Trivial merge