Merged header style changes to master.