Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed bug #75055 Out-Of-Bounds Read in timelib_meridian()
  Apply upstream patch for CVE-2016-1283

diff --cc ext/date/lib/parse_date.c
index bb6cf5f6e2c031a773404692732cf4b2b67181bc,36bcdcc28aa8edf2f8cf6ebb787e25dc4c0fd7d4..77599057f94dd949f90f2c878b81e3b1eea80fe1
--- 1/ext/date/lib/parse_date.c
--- 2/ext/date/lib/parse_date.c
+++ b/ext/date/lib/parse_date.c
@@@ -1,4 -1,4 +1,4 @@@
- /* Generated by re2c 0.15.3 on Mon Sep  4 22:44:17 2017 */
 -/* Generated by re2c 0.15.3 on Tue Oct 24 13:42:24 2017 */
++/* Generated by re2c 0.15.3 on Tue Oct 24 13:44:48 2017 */
  #line 1 "ext/date/lib/parse_date.re"
  /*
   * The MIT License (MIT)