Fix forthcoming.
Created attachment 15489 [details] proposed patch
Comment on attachment 15489 [details] proposed patch reviewed by me
Committed revision 24244.