Merge "Note that you shouldn't use a custom $salt for 'edit' or 'csrf'"