Merged changes from the upstream version 'v1.2.32'

Conflicts resolved:
	doc/cli/faq.md
	lib/utils/fetch.js
	node_modules/npm-registry-client/lib/request.js
	package.json