Merge branch 'develop' into develop_m2_8_1_2
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Tue, 11 Jun 2013 10:51:43 +0000 (11:51 +0100)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Tue, 11 Jun 2013 10:51:43 +0000 (11:51 +0100)

Trivial merge