Merge branch 'master' into settings_auto_update