Make favicon and logo images blocks in the template
Merge pull request #6881 from jasongrout/template-blocks

Make favicon and logo images blocks in the template