Re: [MediaWiki-Core] Merging Puppet changes