Merge branch '2.6.x' #337

Job	Run time
clang-format	10s
Windows MSVC Shared Release	2m 29s
Windows MSVC Shared Debug	2m 58s
Windows MSVC Static Release	4m 19s
Windows MSVC Static Debug	3m 14s
Windows ClangCL Shared Release	3m 37s
Windows ClangCL Shared Debug	3m 0s
Windows ClangCL Static Release	5m 2s
Windows ClangCL Static Debug	5m 0s
Windows Clang Shared Release	2m 41s
Windows Clang Shared Debug	4m 27s
Windows Clang Static Release	2m 42s
Windows Clang Static Debug	2m 36s
Linux GCC Shared Release	57s
Linux GCC Shared Debug	1m 15s
Linux GCC Static Release	1m 19s
Linux GCC Static Debug	2m 7s
Linux Clang Shared Release	1m 15s
Linux Clang Shared Debug	57s
Linux Clang Static Release	1m 51s
Linux Clang Static Debug	1m 24s
macOS Clang Shared Release	2m 15s
macOS Clang Shared Debug	55s
macOS Clang Static Release	1m 19s
macOS Clang Static Debug	1m 23s
	59m 12s

Provide feedback