Merge branch 'civiExit' of https://github.com/colemanw/civicrm-core into colemanw...