Merge pull request #215 from puppetlabs/master

merging master to folsom branch