Merge branch 'hotfix/1.2.22' v1.2.22
authorLaury GvR <laury@gaslightmedia.com>
Tue, 9 Feb 2016 21:10:28 +0000 (16:10 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 9 Feb 2016 21:10:28 +0000 (16:10 -0500)

Trivial merge