Pushed as 2477aea26d..436cd5a625 to master.

--
Oleg