remove gcc4.6+ diag push/pop added in 85eefe94
Merge branch 'master' into dev