Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	lib/index.js