Sync with changes made in the master branch.