Tinkered with header bar to make it cleaner in all contexts.
Merge branch 'master' into production
No Merge Conflict