Pushed as f669a24a95..8cb146a3e6 to master.

--
Oleg