Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Sync version for VC++ 15.7

diff --cc win32/build/confutils.js
index 853b35c3889a286a90e521efdc243c832333b7b9,a47a704a3a38dcff5c1378b2058c1a459fa27f83..7472da1357ea378012f5a6efbc1896a285413022
--- 1/win32/build/confutils.js
--- 2/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@@ -73,8 -73,15 +73,9 @@@ VC_VERSIONS[1910] = 'MSVC15 (Visual C+
  VC_VERSIONS[1911] = 'MSVC15 (Visual C++ 2017)';
  VC_VERSIONS[1912] = 'MSVC15 (Visual C++ 2017)';
  VC_VERSIONS[1913] = 'MSVC15 (Visual C++ 2017)';
+ VC_VERSIONS[1914] = 'MSVC15 (Visual C++ 2017)';
  
  var VC_VERSIONS_SHORT = new Array();
 -VC_VERSIONS_SHORT[1200] = 'VC6';
 -VC_VERSIONS_SHORT[1300] = 'VC7';
 -VC_VERSIONS_SHORT[1310] = 'VC7.1';
 -VC_VERSIONS_SHORT[1400] = 'VC8';
 -VC_VERSIONS_SHORT[1500] = 'VC9';
 -VC_VERSIONS_SHORT[1600] = 'VC10';
  VC_VERSIONS_SHORT[1700] = 'VC11';
  VC_VERSIONS_SHORT[1800] = 'VC12';
  VC_VERSIONS_SHORT[1900] = 'VC14';