2015-09-30 - releng
22:19	<bd808>	Cherry-picked https://gerrit.wikimedia.org/r/#/c/241984 to deployment-puppetmaster	[releng]