fix bug 1449, 0001391, update language
Merge remote-tracking branch 'origin/master'