fix build
Merge remote-tracking branch 'upstream/master'
Merge pull request #2 from fdammeke/master

Puppet.initialize_settings