Merge branch 'hotfix/1.0.22' v1.0.22
authorLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 20:14:56 +0000 (16:14 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 20:14:56 +0000 (16:14 -0400)

Trivial merge