Fix to http://jira.diamond.ac.uk/browse/SCI-1205
Merge branch 'master' of ssh://dascgitolite@dasc-git.diamond.ac.uk/scisoft/scisoft-ui.git