KHRES303 #comment add my config
KHRES-303 #comment fix locale problem
Merge remote branch 'origin/master'