Merge pull request #4730 from iniw/nix