Core puppet.
Merge branch 'dev-puppet'