Roll in daff-1.1.8