Add jsonp-callback method to batch-reporting
Merge branch 'master' into squares