Patch forthcoming.
Created attachment 54014 [details] proposed fix
Comment on attachment 54014 [details] proposed fix Looks good.
Committed revision 58052.