Merge branch 'JAL-1254-hotfix' into Release_2_8_Branch
authorjprocter <jprocter@compbio.dundee.ac.uk>
Fri, 18 Jan 2013 08:09:40 +0000 (08:09 +0000)
committerjprocter <jprocter@compbio.dundee.ac.uk>
Fri, 18 Jan 2013 08:09:40 +0000 (08:09 +0000)

Trivial merge