2016-05-18 - releng
12:46	<urandom>	(re)cherry-picking c/284078 to deployment-prep	[releng]