Fix problems in example plugins
Merge remote-tracking branch 'upstream/master'