Optimization of moderators and beam extraction at the ESS. Issue 2 (30th March 2018)