Finish 1.0-b12
OVERRIDE macros deprecated
Plugin version incremented
Finish 1.1-b13