Sync with puppet-skeleton