Merge branch 'hotfix/1.0.23' v1.0.23
authorLaury GvR <laury@gaslightmedia.com>
Tue, 19 Jul 2016 13:31:50 +0000 (09:31 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 19 Jul 2016 13:31:50 +0000 (09:31 -0400)

Trivial merge