Fix some problems with the script
fix unnecessary file adding
Fix a bad cr
remove a useless echo
Merge branch '0.2.6-dev' into 0.2.6-dev-plugins