am b2292f0a: (-s ours) am c78c71b1: (-s ours) DO NOT MERGE Check password is correct by checking hash

* commit 'b2292f0a2c1ab74c39dd9dcab8ce4c208c9cb4f8':
  DO NOT MERGE Check password is correct by checking hash