fixed report locale issue
Merge remote branch 'upstream/master'