Merge with correct 352 fix

--HG--
extra : amend_source : de0175250b0513ac4e5b0e1ccbea882c40f8d0c9
Merge with full #352 fix.

--HG--
extra : amend_source : 7355e0f48b2b2f86b49a2ee9e38e4e2aa127b27b