favicon: it's my favorite
Merge branch 'master' into gh-pages