K 10 svn:author V 4 jeff K 8 svn:date V 27 2018-03-11T18:43:36.402230Z K 7 svn:log V 36 Correct bogus assert from mismerge. END