Merge pull request #3749 from civicrm/4.4