LUKS fixes (format change!)
Merge pull request #498 from kholia/LUKS-fixes

LUKS fixes (format change!)