Merge branch 'features/JAL-1333' into Release_2_8_2_Branch
authorj.procter@dundee.ac.uk <jprocter@jims-mbp-2.home>
Tue, 22 Jul 2014 19:32:45 +0000 (20:32 +0100)
committerj.procter@dundee.ac.uk <jprocter@jims-mbp-2.home>
Tue, 22 Jul 2014 19:32:45 +0000 (20:32 +0100)

Trivial merge