favicon bug with error messages
Merge branch 'release' into solr