Pushed as dda217f25ac3358b19542deb616756859df7225a to master.

--
Oleg