PR: 13199 Submitted by: Ryuichiro Imura <imura@cs.titech.ac.jp> Tested and modified by: Will Andrews <andrews@technologist.com>