Fix up some URLs in the package.json
Fix regression in options.body
Bump the version number
Merge remote-tracking branch 'upstream/master'