[Bug 737320] Update to upstream 3.10.1