Hi Ida

On Wednesday, 3 February 2021 00:08:24 NZST Meh Mbeh Ida Delphine wrote:
> I sent this patch October last year and couldn't be integrated since it was
> the end of the development cycle.

My sincere apologies for the delay. I have now integrated this, but I did have
to make a few changes:

1) Dropped the newline changes; these weren't related and also modified files
that we want to ship as unmodified copies from upstream.

2) Removed some added copyright notices where they weren't necessary, and
adjusted the dates to reflect when the changes were made in some other cases.

Thanks for the patch!

Paul