Merge "(bug 35884) width:auto unneeded on header element"