Add patch from https://tickets.puppetlabs.com/browse/MODULES-660