Puppet 3.4 fixes