Merge pull request #864 from puppetlabs/litmus