Merge branch '5.6' of https://github.com/civicrm/civicrm-core