Merge master to branch