Patch pushed as 83ecb38148b0edd7f678b078373255f746a4090b with a few
modifications.
Thanks.