Merge branch 'master' into use-augeas-for-host