Changes to support puppet 3.6.2