Merge branch 'hotfix/1.0.23' V1.0.23
authorLaury GvR <laury@gaslightmedia.com>
Thu, 21 Aug 2014 18:22:14 +0000 (14:22 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 21 Aug 2014 18:22:14 +0000 (14:22 -0400)

Trivial merge