K 10 svn:author V 3 hrs K 8 svn:date V 27 2012-05-20T21:05:51.631910Z K 7 svn:log V 31 Merge from HEAD as of r235693. END