settings_1241.xml update 1

Currently in my fork both settings.xml and settings_1241.xml are identical.  This PR reflects both files.  Going forward, I can probably eliminate the settings_1241.xml if the redundancy is no longer needed for a manual merge.