Merge branch 'bug/JAL-689' into Release_2_8_2_Branch
authorJim Procter <jprocter@dundee.ac.uk>
Tue, 25 Nov 2014 21:45:56 +0000 (21:45 +0000)
committerJim Procter <jprocter@dundee.ac.uk>
Tue, 25 Nov 2014 21:45:56 +0000 (21:45 +0000)

Trivial merge