Merge branch 'Release_2_8_Branch'
authorjprocter <jprocter@compbio.dundee.ac.uk>
Mon, 12 Nov 2012 10:00:29 +0000 (10:00 +0000)
committerjprocter <jprocter@compbio.dundee.ac.uk>
Mon, 12 Nov 2012 10:00:29 +0000 (10:00 +0000)

Trivial merge