Somehow I didn't get them in when resolving the conflicts in merging master to my branch.