Merge branch 'hotfix/JAL-1530' into Release_2_8_1_Branch
authorj.procter@dundee.ac.uk <jprocter@jims-mbp-2.lan>
Thu, 3 Jul 2014 18:25:02 +0000 (11:25 -0700)
committerj.procter@dundee.ac.uk <jprocter@jims-mbp-2.lan>
Thu, 3 Jul 2014 18:25:02 +0000 (11:25 -0700)

Trivial merge