Merge branch 'salted-string-hash'