PR: 31116, 31435 Submitted by: David Taylor <davidt@yadt.co.uk> Noticed by: Taoka Fumiyoshi <fmysh@ga2.so-net.ne.jp>