2016-08-25 - releng
23:15	<Amir1>	cherry-picked 306839/1 into puppetmaster	[releng]