2016-08-13 - releng
23:16	<Amir1>	cherry-picking 304678/1 into the puppetmaster	[releng]