2015-09-14 - releng
08:42	<hashar>	rebased integration puppetmaster 61870d1..8cf247f	[releng]