&nbsp; hasn't been needed in empty table cells for a long time
Merge some changes from the themes branch