Merge "Disable warning triggered in Clang r271374"