Merge branches 'master' and 'working' into working
remove .pluginspec file from .git