Merge branch 'JAL-1517_release282' into Release_2_8_2_Branch
authorJim Procter <jprocter@dundee.ac.uk>
Fri, 28 Nov 2014 16:01:37 +0000 (16:01 +0000)
committerJim Procter <jprocter@dundee.ac.uk>
Fri, 28 Nov 2014 16:01:37 +0000 (16:01 +0000)

Trivial merge