TRACKING UPSTREAM - DO NOT MERGE

This PR exists solely to track changes in the upstream repository.  

DO NOT MERGE THIS PULL REQUEST.