7398594 Merge branch 'debian'

Merged and Committed by ahs3 8 years ago
    Merge branch 'debian'
    
    Conflicts:
    	debian/patches/add-testing.patch