Pushed as 299d1f104a..8c0282cf54 to master.

--
Oleg