See attached build log.
(Please do not complain about the need for looking at the build log until you can provide an easy way to open bugs with the correct data picked out of a tinderbox log. Thanks.)
Created attachment 244861 [details]
Fixed with LOTS of magic sed.