Make sure CFLAGS are actually applied, the stupid autotools like to throw in their own and override ours.
Merge remote-tracking branch 'upstream/master'
make -q quieter