Merge branch 'release/1.1.22' v1.1.22
authorLaury GvR <laury@gaslightmedia.com>
Wed, 19 Jul 2017 21:01:53 +0000 (17:01 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 19 Jul 2017 21:01:53 +0000 (17:01 -0400)

Trivial merge