Merge from master branch.