Merged r6285:6297 from features/deb into trunk. Nearing completion on Debian packagi...