Merge branch 'Release_2_8_1_Branch' into develop
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Mon, 8 Jul 2013 12:49:09 +0000 (13:49 +0100)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Mon, 8 Jul 2013 12:49:09 +0000 (13:49 +0100)

Trivial merge