Fix illegal operator in IE7
Merge branch 'security'