code now passes -fpedantic-error
Merge commit 'b0e185604ea88d821e998c47b3fc16b9b16ab9bf'