same as Julien
Merge branch 'master' of github.com:bbcf/bsPlugins