post-bad merge fixes
post-bad merge fixes

leftees/publisher,alphagov/publisher,theodi/publisher,theodi/publisher,leftees/publisher,telekomatrix/publisher,telekomatrix/publisher,leftees/publisher,theodi/publisher,telekomatrix/publisher,alphagov/publisher,leftees/publisher,theodi/publisher,telekomatrix/publisher,alphagov/publisher