Merge pull request #3175 from matt335672/v0_10_fix_potential_name_ove… #2072

Job	Run time
cppcheck	17m 32s
code formatting check	15s
min features with gcc	2m 16s
min features with g++	2m 18s
min features with clang	2m 1s
max features with gcc	3m 17s
max features with g++	2m 29s
max features with clang	3m 48s
max features with gcc and DEBUG	2m 11s
max features with gcc for 32-bit arch (legacy OS)	1m 45s
max features with g++ for 32-bit arch (legacy OS)	1m 52s
max features with clang for 32-bit arch (legacy OS)	2m 3s
	41m 47s

Provide feedback