Trying to untangle the logo from the header bar.
Merge branch 'master' into production
No Merge Conflict