bug #4263 Japanese character encoding not working properly when exporting

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
Merge branch 'QA_4_1'

Conflicts:
	export.php