>>>>> Katsumi Yamaoka wrote:

> So, I wish Simon and Ted to take on this.

Sorry, I forgot to attach a patch.  Here it is: