ssh: update ciphers
Merge branch 'master' into activevideo