Merge branch 'master' into 1.0.x
authorHunter Haugen <hunter@puppetlabs.com>
Tue, 15 Jul 2014 00:02:07 +0000 (17:02 -0700)
committerHunter Haugen <hunter@puppetlabs.com>
Tue, 15 Jul 2014 00:02:07 +0000 (17:02 -0700)

Trivial merge