2016-08-06 - releng
12:28	<Amir1>	cherry-picked 303356/1 into the puppetmaster	[releng]