Merge in DES changed from 0.9.7-stable.
3 files changed