Merge dotmatrix upstream