Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Catch with the latest AppVeyor unzip errors

diff --cc appveyor/build.bat
index 8141face827a7dd198fc3be3c5a66e6d4f259382,a27abc266031491aca2e4d816b34902a60650034..e1d5291aaa7fc4e7556e3ab4695ceb60cc3563df
--- 1/appveyor/build.bat
--- 2/appveyor/build.bat
+++ b/appveyor/build.bat
@@@ -17,13 -17,20 +17,20 @@@ if not exist "%PHP_BUILD_CACHE_SDK_DIR%
        echo Cloning remote SDK repository
        git clone --branch %SDK_BRANCH% %SDK_REMOTE% "%PHP_BUILD_CACHE_SDK_DIR%" 2>&1 
  ) else (
-       echo Fetching remote SDK repository
-       git --git-dir="%PHP_BUILD_CACHE_SDK_DIR%\.git" --work-tree="%PHP_BUILD_CACHE_SDK_DIR%" fetch --prune origin 2>&1
-       echo Checkout SDK repository branch
-       git --git-dir="%PHP_BUILD_CACHE_SDK_DIR%\.git" --work-tree="%PHP_BUILD_CACHE_SDK_DIR%" checkout --force %SDK_BRANCH% 
+       git --git-dir="%PHP_BUILD_CACHE_SDK_DIR%\.git" --work-tree="%PHP_BUILD_CACHE_SDK_DIR%" status 2>&1
+       if %errorlevel% neq 0 (
+               rmdir /s /q "%PHP_BUILD_CACHE_SDK_DIR%"
+               echo Cloning remote SDK repository
+               git clone --branch %SDK_BRANCH% %SDK_REMOTE% "%PHP_BUILD_CACHE_SDK_DIR%" 2>&1 
+       ) else (
+               echo Fetching remote SDK repository
+               git --git-dir="%PHP_BUILD_CACHE_SDK_DIR%\.git" --work-tree="%PHP_BUILD_CACHE_SDK_DIR%" fetch --prune origin 2>&1
+               echo Checkout SDK repository branch
+               git --git-dir="%PHP_BUILD_CACHE_SDK_DIR%\.git" --work-tree="%PHP_BUILD_CACHE_SDK_DIR%" checkout --force %SDK_BRANCH% 
+       )
  )
  
 -set SDK_RUNNER=%PHP_BUILD_CACHE_SDK_DIR%\phpsdk-vc14-%PLATFORM%.bat
 +set SDK_RUNNER=%PHP_BUILD_CACHE_SDK_DIR%\phpsdk-%PHP_BUILD_CRT%-%PLATFORM%.bat
  if not exist "%SDK_RUNNER%" (
        echo "%SDK_RUNNER%" doesn't exist
        exit /b 3