Fix build with 3.x gcc versions.
Merge 3.3.