Update to latest Puppet master branch