fixes #117

undo problematic optimisation that compiled plugins wrongly
Merge remote-tracking branch 'upstream/master'