Update to build upstream 5.2.0