Merge branch 'master' into stdenv-fixes2

Conflicts:
	pkgs/top-level/all-packages.nix