re-adding jk10's changes - was confused by head/branch incompatibilities
re-adding jk10's changes - was confused by head/branch incompatibilities

Ensembl/ensembl-webcode,Ensembl/ensembl-webcode,Ensembl/ensembl-webcode,Ensembl/ensembl-webcode,Ensembl/ensembl-webcode