Merge branch '2.6.x' #500

Job	Run time
clang-format	8s
Windows MSVC Shared Release	1m 34s
Windows MSVC Shared Debug	1m 39s
Windows MSVC Static Release	2m 38s
Windows MSVC Static Debug	3m 1s
Windows ClangCL Shared Release	2m 45s
Windows ClangCL Shared Debug	2m 56s
Windows ClangCL Static Release	4m 40s
Windows ClangCL Static Debug	3m 7s
Windows Clang Shared Release	1m 59s
Windows Clang Shared Debug	1m 40s
Windows Clang Static Release	1m 54s
Windows Clang Static Debug	1m 55s
Linux GCC Shared Release	58s
Linux GCC Shared Debug	40s
Linux GCC Static Release	1m 13s
Linux GCC Static Debug	1m 0s
Linux Clang Shared Release	1m 3s
Linux Clang Shared Debug	43s
Linux Clang Static Release	1m 25s
Linux Clang Static Debug	1m 19s
macOS Clang Shared Release	1m 10s
macOS Clang Shared Debug	52s
macOS Clang Static Release	1m 6s
macOS Clang Static Debug	54s
	42m 19s

Provide feedback