Pushed as e1a0562dae..7675dec155 to master.

--
Oleg