Merge pull request #2220 from DanRigby/master

Fix issue with copy_plugin.cmd failing with exit code 4