Merge in changes on master since branch was created