Merge branch 'bug/JAL-1558' into Release_2_8_2_Branch
authorJim Procter <j.procter@dundee.ac.uk>
Thu, 9 Oct 2014 15:07:15 +0000 (16:07 +0100)
committerJim Procter <j.procter@dundee.ac.uk>
Thu, 9 Oct 2014 15:07:15 +0000 (16:07 +0100)

Trivial merge