Merge "Disable warnings triggered in Clang r271374"