Sync with nixUnstable

Created by  Eelco Dolstra  on July 21, 2017
OC4Q4PXCUDQHZT6XPYN5KOI7HSJHTVAVGJJ2MUFFAG3T5K52GBBQC
Change contents