Merging master to branch.