Rebasing the feature branch against master was too messy, and only these two files were changed. The development history of this branch could easily have been --squash'ed anyway, so not much of a loss