Fix accidental key replacements
Merge branch 'master' of github.com:roundcube/roundcubemail