Merging latest changes in the master branch.