2018-04-09 - releng
18:06	<awight>	Restore to ORES master branch	[releng]