fix sitewide plugin toolbox menu
Merge remote-tracking branch 'upstream/master' into pws