Merging master on the branch