Sync with Nix

Created by  Eelco Dolstra  on February 24, 2016
B2L4T3X63XVYJQXEDU4WT5Y4R6PMDXGC6WN2KGOMHRQILSABNQOAC
Change contents