fix loading of passphrase protected keys
Merge branch 'master' into portable