Updated references of 'general' to 'default' in settings code
Merge remote-tracking branch 'origin/master' into dev