Merge of Jan'c patched files.