Merge "Don't rely on gcc extensions"