Merge branch 'origin/master' into stdenv-updates.

There was a minor conflict in 'stumpwm'. The package needs texinfo
version 4.x. At least is used to, I'm not sure whether it still does.