Merge with latest config.sample.inc.php