Merge branch 'hotfix/1.2.23' v1.2.23
authorLaury GvR <laury@gaslightmedia.com>
Wed, 9 Mar 2016 18:15:52 +0000 (13:15 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 9 Mar 2016 18:15:52 +0000 (13:15 -0500)

Trivial merge