Better test for conflict between optimization and FORTIFY_SOURCE
Merge remote-tracking branch 'upstream/master'