Merge tag 'v1.2.3' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 3 Mar 2015 18:10:15 +0000 (13:10 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 3 Mar 2015 18:10:15 +0000 (13:10 -0500)
v1.2.3


Trivial merge