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

Trivial merge