Merge branch 'hotfix/1.1.22' V1.1.22
authorLaury GvR <laury@gaslightmedia.com>
Wed, 9 Dec 2015 20:27:24 +0000 (15:27 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 9 Dec 2015 20:27:24 +0000 (15:27 -0500)

Trivial merge