Merge branch 'ask-for-password'