Merge branch 'hotfix/1.1.22' v1.1.22 v1.1.23
authorLaury GvR <laury@gaslightmedia.com>
Thu, 16 Apr 2015 14:03:44 +0000 (10:03 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 16 Apr 2015 14:03:44 +0000 (10:03 -0400)

Trivial merge