DO NOT MERGE patch for CRM-12840 by Jamie McClelland
Merge pull request #1465 from colemanw/CRM-12840

DO NOT MERGE patch for CRM-12840 by Jamie McClelland