Merge branch 'hotfix/1.0.22' v1.0.22
authorLaury GvR <laury@gaslightmedia.com>
Mon, 8 Aug 2016 16:35:01 +0000 (12:35 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 8 Aug 2016 16:35:01 +0000 (12:35 -0400)

Trivial merge