Merge branch 'hotfix-2.6.0'
favicon fix
Merge branch 'hotfix-2.6.1' into develop