debhelper 7
Merge branch 'fix_activate_path' into debhelper_7