K 10 svn:author V 6 edavis K 8 svn:date V 27 2013-11-16T00:31:32.998137Z K 7 svn:log V 83 Merge r258187 from head. Approved by: re@ (delphij) Approved by: davidch (mentor) END