* Adjust for latest commit from @kcwu.
* ...and jsonp now works.
Merge remote-tracking branch 'origin/master'