Merged changes from the upstream version 'v1.3.5'

Conflicts resolved:
	lib/cache.js
	lib/ls.js
	node_modules/npm-registry-client/lib/get.js
	package.json