Merge change I885cfc23 into eclair-mr2

* changes:
  make the password-clearing algorithm smarter