Merge branch 'CRM-13015' of git://github.com/davecivicrm/civicrm-core into CRM-13015