Pushed as 88471af678959b1eb4e357a47293030d05de8658 to master.

--
Oleg