Submitted by: sanpei@yy.cs.keio.ac.jp (Closing part of PR #2360.)
Submitted by: MIHIRA Yoshiro <sanpei@yy.cs.keio.ac.jp>