Upstream refresh

Refreshing our master branch from upstream's master branch.