Merge branch 'release/r8p8' into develop
don't hang if ssh-add requires a password (for example if ssh key is wrong/invalid)
Merge branch 'release/r8p9'