Merge branch 'bugfix/JAL-1239' into Release_2_8_1_Branch_i18n
authorJim Procter <jprocter@dundee.ac.uk>
Tue, 13 May 2014 14:16:16 +0000 (15:16 +0100)
committerJim Procter <jprocter@dundee.ac.uk>
Tue, 13 May 2014 14:16:16 +0000 (15:16 +0100)

Trivial merge