Fixed a critical security bug.
Merge branch 'master' of github.com:evildev/ZED