2016-04-12 - releng
19:08	<Amir1>	manually cherry-picked 282992/2 into to puppetmaster	[releng]