Added json/jsonp vulnerability protection
Merged jsonp vulnerability