Merge "Fix off-by-one error in computeEllipsis" into lmp-mr1-dev