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