Pushed as 2519c4cecb..ada945251c to master.

--
Oleg