Merge branch 'master' of https://github.com/G-Node/nix