Merge pull request #849 from lovmoen/master

Problem: zarmour does not support Z85
Merge remote-tracking branch 'upstream/master'