Crm 12821

http://issues.civicrm.org/jira/browse/CRM-12821