Merge branch 'master' into current_working
favicon