2016-11-22 - releng
19:31	<hashar>	beta: rebased puppet master	[releng]