Merge pull request #2006 from civicrm/4.3