Patch applied as 360fea15cb25d0cdf55ec55488956257a0219fe4 with a few
minor modifications.
Thanks.