Merge branch 'JAL-1397' into Release_2_8_1_Branch
authorJim Procter <jprocter@dundee.ac.uk>
Mon, 12 May 2014 15:05:53 +0000 (16:05 +0100)
committerJim Procter <jprocter@dundee.ac.uk>
Mon, 12 May 2014 15:05:53 +0000 (16:05 +0100)

Trivial merge