Merge commit 'refs/pull/14779/head' of git://github.com/NixOS/nixpkgs
Nikolay Amiantov 9 years ago 454a64ca 3868f02b