K 10 svn:author V 7 antoine K 8 svn:date V 27 2014-10-19T22:32:49.240215Z K 7 svn:log V 38 - Update to 2.1.1 - Tighten CONFLICTS END