reset to default fix
#27 copy>duplicate
Merge branch 'master' into 128.55

Conflicts:
	META-INF/plugin.xml