2015-08-12 - releng
16:50	<bd808>	Fixed puppet merge conflict	[releng]