Patches applied as 8036852533b26ce48e82272042ee3ac2a9974ec5 and
following with a few minor modifications (added copyright lines,
modified some commit messages).
Thanks.