Pushed as 69089674bb9fb2cc7b3285b73fb7dda7d99a2550 to master.

--
Oleg