Merge remote-tracking branch 'upstream/pr/14'
Support extra options for xhr