same changes as in branch 121
same changes as in branch 121

at7/ensembl,Ensembl/ensembl,willmclaren/ensembl,at7/ensembl,james-monkeyshines/ensembl,Ensembl/ensembl,muffato/ensembl,willmclaren/ensembl,danstaines/ensembl,mjg17/ensembl,muffato/ensembl,at7/ensembl,at7/ensembl,james-monkeyshines/ensembl,Ensembl/ensembl,james-monkeyshines/ensembl,mjg17/ensembl,muffato/ensembl,Ensembl/ensembl,muffato/ensembl,james-monkeyshines/ensembl,mjg17/ensembl,danstaines/ensembl,danstaines/ensembl,mjg17/ensembl