Merge commit 'refs/pull/14936/head' of git://github.com/NixOS/nixpkgs
Nikolay Amiantov 9 years ago 89dfbd12 f944f490