64e19fdeda
Merging staging into staging-next even though we haven't merged staging-next into master yet. The motivation for this merge is that it's been a while since we merged into master causing the 3 branches to diverge too much.
*** NixOS *** NixOS is a Linux distribution based on the purely functional package management system Nix. More information can be found at http://nixos.org/nixos and in the manual in doc/manual.