Merge "may fix build on some version of gcc"