Merge with upstream

Pull proxmox changes.

@dpavlin