Merge branch 'master' into plugins
Change the directory for plugins