Merge remote-tracking branch 'upstream/master'

Conflicts:
	pkgs/applications/version-management/git-and-tools/git/default.nix
	pkgs/os-specific/linux/kernel/common-config.nix