Merge branch '2.6.x' #335

Job	Run time
clang-format	12s
Windows MSVC Shared Release	26s
Windows MSVC Shared Debug	23s
Windows MSVC Static Release	21s
Windows MSVC Static Debug	25s
Windows ClangCL Shared Release	30s
Windows ClangCL Shared Debug	27s
Windows ClangCL Static Release	17s
Windows ClangCL Static Debug	28s
Windows Clang Shared Release	20s
Windows Clang Shared Debug	22s
Windows Clang Static Release	19s
Windows Clang Static Debug	17s
Linux GCC Shared Release	57s
Linux GCC Shared Debug	52s
Linux GCC Static Release	1m 43s
Linux GCC Static Debug	1m 3s
Linux Clang Shared Release	1m 3s
Linux Clang Shared Debug	54s
Linux Clang Static Release	1m 22s
Linux Clang Static Debug	1m 46s
macOS Clang Shared Release	1m 10s
macOS Clang Shared Debug	56s
macOS Clang Static Release	2m 40s
macOS Clang Static Debug	1m 15s
	20m 28s

Provide feedback