Merge branch 'hotfix/1.0.23' v1.0.23
authorLaury GvR <laury@gaslightmedia.com>
Thu, 1 Oct 2015 20:30:20 +0000 (16:30 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 1 Oct 2015 20:30:20 +0000 (16:30 -0400)

Trivial merge