Add GCC 4.8.x compatibility