refs #1544 debug
Merge branch 'akouryy_ja'

Conflicts:
	lib_ja.php