Pushed as 5a77f2ee54..c185c51e14 to master.

--
Oleg