CR review
Merge pull request #7 from wangsha/pullrequests/i18n

Pullrequests/i18n
Merge branch 'upstream-master' into pullrequests/databox