use serve-favicon instead of static-favicon
Merge remote-tracking branch 'upstream/master'