Merge pull request #1802 from dlobo/CRM-13554

CRM-13554
Merge branch '4.3' of git://github.com/civicrm/civicrm-core into CRM-13554