Merge branch 'hotfix/1.2.3'
authorLaury GvR <laury@gaslightmedia.com>
Tue, 3 Mar 2015 18:10:09 +0000 (13:10 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 3 Mar 2015 18:10:09 +0000 (13:10 -0500)

Trivial merge