Merge branch 'nix'