K 10 svn:author V 3 ian K 8 svn:date V 27 2018-03-24T19:05:59.590022Z K 7 svn:log V 213 Record-only merge of r324416. The actual code was merged in 327633, but I forgot to add the merge info then (it wasn't so much a merge as recreating on the branch the same conceptual change as was done on head). END