Pushed as 1583fe7e24..da582bcf50 to master. -- Oleg