This branch was never actually merged, and after further though, I'm fixing this problem while also fixing bug 993436.
« Back to merge proposal
This branch was never actually merged, and after further though, I'm fixing this problem while also fixing bug 993436.