Apply 1ca5ef1 to ja
Apply 15f2bf1 to ja tree
Apply 2a0a837 to ja tree
Apply bdef6f7 to ja tree
Merge pull request #632 from harupong/master

[ja] catch up with updates on en tree