Merge branch 'Release_2_8_Branch' into develop
authorjprocter <jprocter@compbio.dundee.ac.uk>
Sat, 17 Nov 2012 21:59:16 +0000 (21:59 +0000)
committerjprocter <jprocter@compbio.dundee.ac.uk>
Sat, 17 Nov 2012 21:59:16 +0000 (21:59 +0000)

Trivial merge