Fix off-by-one error
Merge branch 'master' into debian
changelog