Sync with Nix

Created by  Eelco Dolstra  on February 25, 2016
V6H6BWMKUGENVYLLCT56NWU7YYPADYI65Q4KSGPOJIZF2LWQRN2QC
Change contents