Patch to fix build on GCC 4.8