Comment 3 for bug 1003409

I have added the fix from 10021287 and rebased down to 1 commit.

The single commit branch is at working/user/dyrcona/lp1003409

IMO, this is the branch that should be merged. Anyone who wants to see the historical development of the code can look at the other branch.