Pull in Upstream Changes

Doco, JSONP support and bugfix.