Merge with master

--HG--
extra : amend_source : 3cc9be7eb9bb69645bc3c17a987e4cd3cffeb577