CRM-12674

----------------------------------------
* CRM-12674:
  http://issues.civicrm.org/jira/browse/CRM-12674
Merge pull request #901 from dlobo/CRM-12674

CRM-12674