Fix for Puppet 2.6.x