Syncing to upstream repo

Generating pull requests to update user's fork to match
the master repo's master branch.