jsonp and swagger
Merge remote-tracking branch 'origin/master' into remote-master