Merge "Remove @defgroup from DefaultSettings.php"