Merge remote-tracking branch 'origin/roland' into manfred
Formula-Factory stuff added to plugin.xml
Merge remote-tracking branch 'origin/manfred' into roland