Merge branch 'patch_JAL-689' into Release_2_8_2_Branch
authorJim Procter <jprocter@dundee.ac.uk>
Tue, 25 Nov 2014 21:34:43 +0000 (21:34 +0000)
committerJim Procter <jprocter@dundee.ac.uk>
Tue, 25 Nov 2014 21:34:43 +0000 (21:34 +0000)

Trivial merge