Summary:Project:Support desk/upgrade problems: 1.11 -- 1.21

Bug reported at 48820. See the full thread for a solution until a fix for 1.21 is released.