Update to latest upstream code