Merge branch 'Release_2_8_0b1_Branch'
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Thu, 30 Jan 2014 20:20:56 +0000 (20:20 +0000)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Thu, 30 Jan 2014 20:20:56 +0000 (20:20 +0000)

Trivial merge