Merge pull request #1058 from puppetlabs/issue-1057