2016-09-14 - releng
15:21	<godog>	cherry-pick https://gerrit.wikimedia.org/r/#/c/310557/ on puppet master	[releng]