2016-05-05 - tools
13:11	<godog>	cherry-pick https://gerrit.wikimedia.org/r/#/c/280652/ on puppetmaster	[tools]