unused include
Merge branch 'master' into beta
EncryptionInfo moved to ZLFile level
Merge branch 'master' into beta