Merged changeset 2228 from trunk, security bug fix
Authored by: artyom-beilis 2013-01-02
Parent: [r2228]
Child: [r2230]