trunk -> master
trunk -> master

zimbatm/nix,nbp/nix,rycee/nix,rycee/nix,rycee/nix,ehmry/nix,ysangkok/nix,garbas/nix,dezgeg/nix,rowhit/nix,wmertens/nix,acowley/nix,joelmo/nix,aucampia/nix,tchajed/nix,joelmo/nix,vcunat/nix,dezgeg/nix,gridaphobe/nix,shlevy/nix,joelmo/nix,vcunat/nix,ehmry/nix,shlevy/nix,gebner/nix,layus/nix,bennofs/nix,puffnfresh/nix,shlevy/nix,bjornfor/nix,NixOS/nix,nbp/nix,bennofs/nix,peti/nix,offlinehacker/nix,NixOS/nix,ehmry/nix,joelmo/nix,ehmry/nix,ttuegel/nix,rycee/nix,shlevy/nix,peti/nix,ysangkok/nix,gridaphobe/nix,vcunat/nix,garbas/nix,puffnfresh/nix,zimbatm/nix,garbas/nix,bjornfor/nix,wmertens/nix,dtzWill/nix,layus/nix,dtzWill/nix,zimbatm/nix,NixOS/nix,tchajed/nix,zimbatm/nix,offlinehacker/nix,vizanto/nix,dezgeg/nix,ttuegel/nix,rowhit/nix,tchajed/nix,ttuegel/nix,NixOS/nix,dtzWill/nix,aucampia/nix,layus/nix,pikajude/nix,gebner/nix,pikajude/nix,puffnfresh/nix,dtzWill/nix,wmertens/nix,NixOS/nix,vcunat/nix,gebner/nix,layus/nix,puffnfresh/nix,peti/nix,nbp/nix,tchajed/nix,jcumming/nix,bjornfor/nix,peti/nix,aucampia/nix,garbas/nix,acowley/nix,dtzWill/nix,acowley/nix,rycee/nix,gridaphobe/nix,bjornfor/nix,rowhit/nix,peti/nix,jcumming/nix,vizanto/nix,rowhit/nix,layus/nix,pikajude/nix,gebner/nix,offlinehacker/nix,ehmry/nix,offlinehacker/nix,ehmry/nix,garbas/nix,wmertens/nix,acowley/nix,jcumming/nix,bennofs/nix,dezgeg/nix,gridaphobe/nix,ysangkok/nix,nbp/nix,shlevy/nix,aucampia/nix,ttuegel/nix,dezgeg/nix,vizanto/nix,jcumming/nix,vizanto/nix,bennofs/nix