plugin.xml changed for minor experimenting
Merge branches 'combination' and 'master' into combination