Merge pull request #1 from TEdit/master

Import latest updates
Maintenance
Merge pull request #2 from TEdit/master

Import latest updates - 14214
Interim settings.xml update
Revised alternate settings.xml
Merge pull request #539 from SBlogic/master

settings_1241.xml update 1