Merge branch 'master' into old
Merge with no fast-forward option so commit will be made and will have two parrents