Merge branch 'staging'

It seemed very fine on Hydra before it was cancelled due to glibc rebuild,
in particular the nixpkgs unstable job succeeded except for
bootstrap-tarball tests which should be fine after ee994dfa.

Therefore, let's avoid another mass rebuild by merging now when we don't
have binaries for master anyway.