Merge branch 'master' into Chinese

Conflicts:
zh/index.html