Merge pull request #1 from Rythal/master

Routine sync with main carbonite
Merge pull request #2 from Rythal/master

Routine sync with main carbonite
Some tiny little modification
Merge pull request #3 from Rythal/master

Routine sync with main carbonite
For 6.0 RC

Easy peasy lemon squeezy
Merge pull request #30 from Raka-loah/localeonly

zhCN locale for 6.0 Release Candidate
Merge remote-tracking branch 'upstream/master' into N2C1