Merge branch 'release/1.2.3' v1.2.3
authorLaury GvR <laury@gaslightmedia.com>
Fri, 24 Jul 2015 15:36:20 +0000 (11:36 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 24 Jul 2015 15:36:20 +0000 (11:36 -0400)

Trivial merge