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