Update DMSQUARED->DMSQD
merge latest master