Rebase 68

Fixes puppetlabs/puppetlabs-lvm#68