Merge branch 'master' of https://github.com/civicrm/civicrm-core into CRM-10551