K 10 svn:author V 6 jbeich K 8 svn:date V 27 2017-11-22T06:24:39.258799Z K 7 svn:log V 26 gecko: simplify conflicts END