Flag fix.
Unifies anti-gib under NOGIB.
Merge pull request #10000 from KA101/nogib

Flag fix
Merge branch 'master' into diaperfur