K 10 svn:author V 6 amdmi3 K 8 svn:date V 27 2016-12-16T10:10:07.557245Z K 7 svn:log V 111 - Make plugins optional - Switch to options helpers - Cosmetic fixes - Remove obsolete conflicts - Fix COMMENT END