opt: The performance.
Merge branch 'master' into gh-pages