Oops, missed a conflict marker.
Merge branch 'master' of github.com:s9y/additional_plugins