Pushed as 548a4ac51c..bd4c6bbf0a to master.

--
Oleg