CRM-14121 - Apply patch by Ben Wilhelm