Update to upstream 1.5