Merge pull request #791 from eimlav/puppet4ify