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

Trivial merge