Merge branch 'PHP-7.1'

* PHP-7.1:
  adjust deps dir naming scheme

diff --cc appveyor/build_task.bat
index 1f5485e8bde3fd11f502409b82418dcf9eae61d2,5b88159d66007cf64e49ab433bb71af0a7dd0067..5ed71174629a4a24625cbbd3abd9873469c655d0
--- 1/appveyor/build_task.bat
--- 2/appveyor/build_task.bat
+++ b/appveyor/build_task.bat
@@@ -17,10 -17,10 +17,10 @@@ if /i "%APPVEYOR_REPO_BRANCH:~0,4%" eq
        set BRANCH=master
        set STABILITY=staging
  )
- set DEPS_DIR=%PHP_BUILD_CACHE_BASE_DIR%\deps-%PHP_SDK_VC%-%PHP_SDK_ARCH%-%BRANCH%
+ set DEPS_DIR=%PHP_BUILD_CACHE_BASE_DIR%\deps-%BRANCH%-%PHP_SDK_VC%-%PHP_SDK_ARCH%
  rem SDK is cached, deps info is cached as well
  echo Updating dependencies in %DEPS_DIR%
 -call phpsdk_deps --update --branch %BRANCH% --stability %STABILITY% --deps %DEPS_DIR%
 +call phpsdk_deps --update --branch %BRANCH% --stability %STABILITY% --deps %DEPS_DIR% --crt vc15
  if %errorlevel% neq 0 exit /b 3
  
  call buildconf.bat --force