Using new namespace 'Plugin'
Merge remote-tracking branch 'origin/master'