Resolve merge conflict.
Resolve merge conflict.

muffato/ensembl,Ensembl/ensembl,muffato/ensembl,muffato/ensembl,james-monkeyshines/ensembl,Ensembl/ensembl,danstaines/ensembl,danstaines/ensembl,muffato/ensembl,james-monkeyshines/ensembl,james-monkeyshines/ensembl,Ensembl/ensembl,danstaines/ensembl,Ensembl/ensembl,james-monkeyshines/ensembl