Cleanup extrenous files from branches being merged (the curators of those branches had failed to keep up-to-date with the master branch)