refs #1580 fix bug
Merge branch 'master' into akouryy_ja

Conflicts:
	lib_ja.php