Pushed as a28498d83d644d02a0e02ce74954c6e936ff0543 to master.

--
Oleg