2014-08-01 - releng
15:03	<bd808>	Updated cherry-pick of Iceb8f43	[releng]