Merge branch 'JAL-1517_release282' into Release_2_8_2_Branch
authorJim Procter <jprocter@dundee.ac.uk>
Tue, 2 Dec 2014 18:02:19 +0000 (18:02 +0000)
committerJim Procter <jprocter@dundee.ac.uk>
Tue, 2 Dec 2014 18:02:19 +0000 (18:02 +0000)

Trivial merge