fixing merge
Merge pull request #699 from guardian/jsonp-all-pages

fixing merge