Fix packaging error
Merge branch 'packaging/debian/master' into packaging/debian/trusty