Something funny gone on with cherry-picking - I'll add it back in.  Sorry about that - I had some branch madness this morning.