Merge changes in the English version (1.24 -> 1.25).
Submitted by: "Yoshinori Kondo" <ykondo@bf.mbn.or.jp> and kuriyama