Merge branch 'bugfix/favicon-too-long' into 'develop'