Merge pull request #1 from civicrm/master

to update my branch
Merge branch 'master' of https://github.com/joannechester/civicrm-core