Submodule update
Merge remote-tracking branch 'upstream/master'
Submodule update
Merge pull request #149 from stefk/plugins-update

Plugins update