Update to latest upstream version