K 10 svn:author V 3 dim K 8 svn:date V 27 2018-08-02T17:59:51.680679Z K 7 svn:log V 87 Merge clang trunk r338150 (just before the 7.0.0 branch point), and resolve conflicts. END