Merge with branch master and get copy edits commit