2016-09-21 - releng
08:37	<hashar>	beta: manually rebased puppetmaster	[releng]