Merge "(bug 41886) make $.tablesorter support headers with colspan"