Merge branch 'master' into apps_settings.