It's been a while since the last merge, so I encountered more pain than usual in this merge. I noticed quite a few target library failures, but those seem to have been there already, thanks to my less than stellar testing on my last big set of patches in October :(. I will be fixing the target library problems in subsequent patches. Aldy