2014-12-16 - releng
17:13	<bd808>	removed cherry pick of I6084f49e97c855286b86dbbd6ce8e80e94069492 (merged by Ori with a change)	[releng]