Update to current upstream version