Merge branch 'master' into 1.6.4
Want to reset the source always.
Fixed security issues with arrays
Added braces
Merge branch '1.6.4'