Merge pull request #6450 from civicrm/4.6