Bug 854389 - Patch to allow building with gcc 4.7