merging changes from branch-ensembl-68
merging changes from branch-ensembl-68

muffato/public-plugins,muffato/public-plugins,Ensembl/public-plugins,muffato/public-plugins,muffato/public-plugins,Ensembl/public-plugins,Ensembl/public-plugins