favicon fix
Merge branch 'hotfix-2.6.1'