DO NOT MERGE patch for CRM-12840 by Jamie McClelland