Merge branch 'master' of https://github.com/Ensembl/ensembl

.travis.yml

@@ -56,7 +56,7 @@ matrix:
 
 notifications:
   email:
-    on_success: always
-    on_failure: always
+    on_failure: change
   slack:
     secure: gTcWzQsVHKPxRJ1u0U2l2+QVujmG1uFW44kAO3l46V5Im5uLTOLeM20ykk6ox4kaPHLs5ky7NGzcJmTDLaHBKjI4Sa34l4tJd0lhkv+hKj9TSv5pDDCdUX8v869Nm8LqJKh26HqvVcN7eHFRatLD/tfYvvkaP1rLLhwLLdr7czQ=
+    on_failure: change

modules/t/registry_public_cores.t

@@ -22,8 +22,11 @@ use Test::Exception;
 use Bio::EnsEMBL::Registry;
 use Bio::EnsEMBL::ApiVersion;
 
-my $version = software_version()-1;
-Bio::EnsEMBL::Registry->load_registry_from_url('mysql://anonymous@ensembldb.ensembl.org:5306/'.$version);
+# [ENSCORESW-2475]. With the new branching policy, next release DBs are unavailable
+# when adding a version upgrade to the following one.
+my $version = software_version()-2;
+
+Bio::EnsEMBL::Registry->load_registry_from_url('mysql://anonymous@ensembldb.ensembl.org/'.$version);
 
 my $dbas = Bio::EnsEMBL::Registry->get_all_DBAdaptors(-GROUP=>'core');
 my $min = 10;