Merge commit 'refs/pull/14677/head' of git://github.com/NixOS/nixpkgs
Nikolay Amiantov 9 years ago 3f9cfba0 0ffd6d16