Merge remote-tracking branch 'origin/8.39'
Merge branch 'master' of ssh://dascgitolite@dasc-git.diamond.ac.uk/gda/gda-diamond.git