Comment From: sbrannen

This has been merged into main in c85050eb43c37f084ae5bd31a708d0e2825ea43c.

Thanks

p.s. please note that I updated the copyright dates accordingly.