Merge branch 'ticket31372_035' into ticket31372_040

diff --cc .appveyor.yml
index f4fd3774b40b197c3b37c0d17a3df3d1ee79e63a,25f87fa457f2f214920786aaa4a596bc0dbccec8..8177a23cfb051573ba509f9259c47a1122fdc947
--- 1/.appveyor.yml
--- 2/.appveyor.yml
+++ b/.appveyor.yml
@@@ -95,9 -95,7 +95,9 @@@ test_script
              $buildpath = @("C:\msys64\${env:compiler_path}\bin") + $oldpath
              $env:Path = $buildpath -join ';'
              Set-Location "${env:build}"
-             Execute-Bash "VERBOSE=1 make -j2 check"
 +            Copy-Item "C:/msys64/${env:compiler_path}/bin/libssp-0.dll" -Destination "${env:build}/src/test"
 +            Copy-Item "C:/msys64/${env:compiler_path}/bin/zlib1.dll" -Destination "${env:build}/src/test"
+             Execute-Bash "VERBOSE=1 make -k -j2 check"
      }
  
  on_finish:

diff --cc .travis.yml
Simple merge