add another fallback cipher
Merge branch 'master' into activevideo