apply patch generated by matt #15

Job	Run time
code formatting check	15s
cppcheck	17m 42s
min features with gcc	2m 54s
min features with g++	2m 36s
min features with clang	2m 56s
max features with gcc	3m 38s
max features with g++	3m 14s
max features with clang	4m 1s
max features with gcc and DEBUG	3m 13s
max features with gcc for 32-bit arch (legacy OS)	1m 38s
max features with g++ for 32-bit arch (legacy OS)	1m 24s
max features with clang for 32-bit arch (legacy OS)	1m 55s
	45m 26s

Provide feedback