[bug 884779] Fix invalid markup - recent revisions