Merge remote branch 'origin/ft/R277' into 7.x-1.x-wip Solved conflicts: modules/opac_authorities/includes/harvest.inc