merge

--HG--
branch : coverity