Merge branch '1.4.x' into 14x-merge
authorAshley Penney <ashley.penney@puppetlabs.com>
Wed, 14 May 2014 17:17:19 +0000 (13:17 -0400)
committerAshley Penney <ashley.penney@puppetlabs.com>
Wed, 14 May 2014 17:17:19 +0000 (13:17 -0400)

Trivial merge