Pushed as d7abe61507..b577550c00 to master.

--
Oleg