Squashed 'plugin/' content from commit e267db5

git-subtree-dir: plugin
git-subtree-split: e267db5314e63b6ad9819f48cc7ec7956d624aef
Merge commit 'b5e435016522d040f41289348156df4c996efe30' as 'plugin'