Update to upstream version