This is based on upstream commit ab4d62eb975a4c4c51dd35822665050e2ddc6918 with the changed to the ChangeLog file removed.