[upstream] Update to latest revision