Merge "Better merge message for GitHub pull reqeusts" into feature/zuulv3