Apply 7092f29 to ja tree
Apply 0ecb879 to ja tree
Apply 1786822 to ja tree
Apply 20a3f53 to ja tree
Apply 9c4252b to ja tree
Apply 5f72fef to ja tree
Apply f987da8 to ja tree
Apply f5170bb to ja tree
Apply #750 #787 to ja tree

Also applied 038f1f0 as it is related to those two pull requests.
Merge pull request #807 from harupong/update-ja

[ja] Catch up with en/ updates