Merge changes from debian_version_0_5_93.
5 files changed