Suppressed null warning
Changes made by Paul to resolve errors with javax.media and
org.uncommons.maths
Merge branch 'master' of ssh://dascgitolite@dasc-git.diamond.ac.uk/scisoft/scisoft-core.git