Merge branch 'dev_from_2_8_1' into develop
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Tue, 15 Oct 2013 10:23:44 +0000 (11:23 +0100)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Tue, 15 Oct 2013 10:23:44 +0000 (11:23 +0100)

Trivial merge