Merge latest changes into master branch.