Merge commit 'refs/pull/27485/head' of github.com:NixOS/nixpkgs into staging
Merges #27485.
Thomas Tuegel 8 years ago dd61dbf5 629becb5