Merge DGI upstream into Berkeley.