Remove redundant escapes
Remove more redundant escapes
Merge remote branch 'origin/master' into password_hash