Comment 23 for bug 145604

Looks good to me generally. Can go in 1.6 after testing.