Merge branch '8.36' of ssh://dasc-git.diamond.ac.uk/gda/gda-scm into 8.36