Merge branch 'kf/askpass-config'