Merge commit 'f31bb1aff8005525749df7b519fd60ef08157bfc' into eclair-mr2 * commit 'f31bb1aff8005525749df7b519fd60ef08157bfc': Fix a race condition determining whether password fallback mode is allowed.