revert change of manifest
Merge branch 'master' into debian