Merge branch '2.6.x' #336

Job	Run time
clang-format	11s
Windows MSVC Shared Release	2m 24s
Windows MSVC Shared Debug	3m 13s
Windows MSVC Static Release	2m 57s
Windows MSVC Static Debug	3m 44s
Windows ClangCL Shared Release	3m 37s
Windows ClangCL Shared Debug	2m 53s
Windows ClangCL Static Release	6m 12s
Windows ClangCL Static Debug	5m 27s
Windows Clang Shared Release	3m 6s
Windows Clang Shared Debug	4m 19s
Windows Clang Static Release	2m 58s
Windows Clang Static Debug	2m 18s
Linux GCC Shared Release	54s
Linux GCC Shared Debug	58s
Linux GCC Static Release	1m 12s
Linux GCC Static Debug	1m 9s
Linux Clang Shared Release	1m 7s
Linux Clang Shared Debug	42s
Linux Clang Static Release	1m 20s
Linux Clang Static Debug	2m 13s
macOS Clang Shared Release	2m 24s
macOS Clang Shared Debug	58s
macOS Clang Static Release	1m 4s
macOS Clang Static Debug	1m 6s
	58m 26s

Provide feedback