K 10 svn:author V 6 edavis K 8 svn:date V 27 2013-10-11T17:34:20.054097Z K 7 svn:log V 79 Merge r256299 from head. Approved by: re@ (gjb) Approved by: davidch (mentor) END