circumvent "empty content" filters (again using `&ensp;`)
Merge remote-tracking branch 'origin/revamp2' into revamp2