modified: config, skin, plugin
Merge remote-tracking branch 'origin/master'