Merge branch 'sudo_defaults'