Automatic merging of dev into master
Automatic merging of dev into master

* dev:
  canonical_annotation has been retired, removing leftover variables

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