Merge pull request #1923 from civicrm/4.3