Up version to 4.10.4.
Fix benchmark scripts.
Merge branch 'master' into doc-tags