Patch pushed as d4449565ed90aabaa6b755dfe1786a1dce370707 with a slightly
modified commit message.
Thanks.