Merge branch 'hotfix/1.1.22' v1.1.22
authorLaury GvR <laury@gaslightmedia.com>
Fri, 10 Jun 2016 21:10:28 +0000 (17:10 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 10 Jun 2016 21:10:28 +0000 (17:10 -0400)

Trivial merge