Catch up with 5.3-BETA7.
Submitted by: OHSAWA Chitishi <ohsawa@ccn.aitai.ne.jp> Reviewed by: Yoshihiko Sarumaru <mistral@imasy.or.jp>