Pushed as 96e6c1ef28..b0b9d757a7 to master.

--
Oleg