Merge branch 'hotfix/1.1.23' v1.1.23
authorLaury GvR <laury@gaslightmedia.com>
Fri, 10 Jun 2016 21:14:26 +0000 (17:14 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 10 Jun 2016 21:14:26 +0000 (17:14 -0400)

Trivial merge