Revert 1d56dde..ca0c4fb

This rolls back to commit 1d56dde0288d942ae75716fb812f6c1fd1484d9a.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/hashsalt.js