Remove remnants of old_password
Merge branch 'master' into angular