A two-in-one patch from the bugtracker