Merge branch 'Release_2_8_1_Branch' into Release_2_8_1_Branch_i18n
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Thu, 24 Oct 2013 15:32:39 +0000 (16:32 +0100)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Thu, 24 Oct 2013 15:32:39 +0000 (16:32 +0100)

Trivial merge