build-depends updates
Merge branch 'master' into cross-subblog