Missing header
Merge branch 'master' into debian-unstable