GCC 8 Warnings

Can !99 (merged) / 3bbc37a3 be backported to releases/2.6 please.