FL-1399: gcc-4.8.2 Seg Fault Patch