Merge changes from current upstream master branch.