Pushed as 15b96de852..48b8655667 to master.

--
Oleg