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

Trivial merge