Merge branch 'develop' into develop_m2_8_1_2
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Fri, 21 Jun 2013 13:13:11 +0000 (14:13 +0100)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Fri, 21 Jun 2013 13:13:11 +0000 (14:13 +0100)

Trivial merge