Fix use of deprecated Defaults.defaultSettings
Merge branch 'master' into ExtensionMethodTesting