Merge branch 'feature/JAL-1379' into Release_2_8_2_Branch
authorJim Procter <jprocter@dundee.ac.uk>
Tue, 10 Jun 2014 17:01:22 +0000 (18:01 +0100)
committerJim Procter <jprocter@dundee.ac.uk>
Tue, 10 Jun 2014 17:01:22 +0000 (18:01 +0100)

Trivial merge