Pushed as 1e69ac70c7..0cf4de40a2 to master

--
Oleg