Rolled changes from debian back into master.

Signed-off-by: Adam Stark <adstark1982@yahoo.com>