Merge pull request #822 from ekohl/apt-key-fixes