Merge branch 'master' into revert-1031-cookie_sync

Conflicts:
	request.js