Merge in 'tiger'.

I had add a patch to get it to build.