Pushed as b5c33f99e3...1b7d53dad7 to master.

--
Oleg