Applied patch from CM that fixes build with new gcc