Merge remote-tracking branch 'NixOS/master' into lazy-trees#4

bb010g wants to merge 1 commit intoedolstra:lazy-treesedolstra/nix:lazy-treesfrom

bb010g:lazy-treesbb010g/nix:lazy-treesCopy head branch name to clipboard