Add favicon to sphinx config
Merge branch 'branch2.4'