Patch 4 was slightly too big for the list, here it is as a compressed
attached file.

Simon