Merge branch '2.6.x' #499

Job	Run time
clang-format	6s
Windows MSVC Shared Release	2m 7s
Windows MSVC Shared Debug	1m 24s
Windows MSVC Static Release	2m 56s
Windows MSVC Static Debug	2m 20s
Windows ClangCL Shared Release	2m 59s
Windows ClangCL Shared Debug	2m 46s
Windows ClangCL Static Release	4m 27s
Windows ClangCL Static Debug	4m 17s
Windows Clang Shared Release	2m 2s
Windows Clang Shared Debug	1m 38s
Windows Clang Static Release	2m 15s
Windows Clang Static Debug	2m 18s
Linux GCC Shared Release	48s
Linux GCC Shared Debug	39s
Linux GCC Static Release	1m 15s
Linux GCC Static Debug	58s
Linux Clang Shared Release	1m 4s
Linux Clang Shared Debug	41s
Linux Clang Static Release	1m 21s
Linux Clang Static Debug	1m 14s
macOS Clang Shared Release	1m 7s
macOS Clang Shared Debug	1m 0s
macOS Clang Static Release	1m 6s
macOS Clang Static Debug	54s
	43m 42s

Provide feedback