---------------------------------------- * CRM-16904: https://issues.civicrm.org/jira/browse/CRM-16904