Merge "New header fix for gcc 4.7 build."