Merge branch 'develop' into develop_m2_8_1_2
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Wed, 19 Jun 2013 16:02:02 +0000 (17:02 +0100)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Wed, 19 Jun 2013 16:02:02 +0000 (17:02 +0100)

Trivial merge