2014-11-20 - releng
13:20	<hashar>	rebased puppet master	[releng]