Update to upstream release 2.0.0
PR: 215814 Submitted by: joe@thrallingpenguin.com Reviewed by: riggs