- BFN
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
Fixed (some of) add/sub.

This worked in PHP 5.4 already, but with the introduction of DateTimeImmutable
this code was not correctly merged.
Merge branch 'PHP-5.5' into PHP-5.6
Merge branch 'PHP-5.6'
Merge branch 'PHP-5.4' into PHP-5.5
Merge branch 'PHP-5.5' into PHP-5.6
Merge branch 'PHP-5.6'
Bump year
Merge branch 'PHP-5.4' into PHP-5.5
Bump year
Merge branch 'PHP-5.5' into PHP-5.6
Bump year
Merge branch 'PHP-5.6'
Bump year
Here need to be str_efree

found by ext/standard/tests/general_functions/phpinfo2.php fails
Merge branch 'PHP-5.6'
Fixed bug #66395 basename function doesn't remove drive letter
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #66395 basename function doesn't remove drive letter
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #66395 basename function doesn't remove drive letter