Merge branch 'JAL-1526' into Release_2_8_2_Branch
authorJim Procter <jprocter@dundee.ac.uk>
Mon, 23 Jun 2014 15:21:42 +0000 (16:21 +0100)
committerJim Procter <jprocter@dundee.ac.uk>
Mon, 23 Jun 2014 15:21:42 +0000 (16:21 +0100)

Trivial merge