Pushed as d3d87b93d2..193a01d73f to master.

--
Oleg