Merge commit 'refs/pull/14909/head' of git://github.com/NixOS/nixpkgs into staging
Nikolay Amiantov 9 years ago 5e85760f 5f195425