Pushed as eb77abfb44..d3bc9e73e5 to master.

--
Oleg