merged with 2.3-maintenance

--HG--
branch : trunk