K 10 svn:author V 7 vanilla K 8 svn:date V 27 2015-01-13T12:53:29.701820Z K 7 svn:log V 35 Fix CONFLICTS. Submitted by: mat@ END