Create addon_plugins dir if missing
Merge remote-tracking branch 'upstream/master'