Merge of dladd couple1d0d branch plus fixes for parallelism.