Pushed as 74d2c8304f3839efcbb048d23f366df9f33d7646 to master.

--
Oleg