New upstream version which includes some of the changes monkey-patched
in from the previous version.