Merge branch '2.x' into 3.x

* 2.x:
  Fix 7.4 on Travis
  Fix version
  Bump version to 2.12.5-DEV
  Prepare the 2.12.4 release
  Bump version to 1.42.6-DEV
  Prepare the 1.42.5 release

.travis.yml

@@ -36,7 +36,7 @@ jobs:
     include:
         - php: 7.2
         - php: 7.3
-        - php: 7.4snapshot
+        - php: 7.4
         # Drupal does not support 3.x yet
         #- stage: integration tests
         #  php: 7.3

CHANGELOG

@@ -34,7 +34,11 @@
  * bumped minimum PHP version to 7.2
  * removed PSR-0 classes
 
-* 2.12.4 (2020-XX-XX)
+* 2.12.5 (2020-XX-XX)
+
+ * n/a
+
+* 2.12.4 (2020-02-11)
 
  * Avoid exceptions when an intl resource is not found
  * Fix implementation of case-insensitivity for method names
@@ -332,7 +336,11 @@
  * improved the performance of the filesystem loader
  * removed features that were deprecated in 1.x
 
-* 1.42.5 (2020-XX-XX)
+* 1.42.6 (2020-XX-XX)
+
+ * n/a
+
+* 1.42.5 (2020-02-11)
 
  * Fix implementation of case-insensitivity for method names