Added package to module import path in Joke plugin
Fix module import paths in standard plugins
Merge remote-tracking branch 'upstream/master'