Merge branch davvid/ssh-askpass for #1049