Merge pull request #6363 from civicrm/CRM-16944