Merge branch 'hotfix/JAL-1521' into Release_2_8_1_Branch
authorJim Procter <j.procter@dundee.ac.uk>
Thu, 23 Oct 2014 16:24:33 +0000 (17:24 +0100)
committerJim Procter <j.procter@dundee.ac.uk>
Thu, 23 Oct 2014 16:24:33 +0000 (17:24 +0100)

Trivial merge