Merge branch 'hotfix/1.1.23' V1.1.23
authorLaury GvR <laury@gaslightmedia.com>
Thu, 10 Dec 2015 19:32:49 +0000 (14:32 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 10 Dec 2015 19:32:49 +0000 (14:32 -0500)

Trivial merge