Merge "Fix HTML output of TablePager"