Merge branch 'develop' into develop_m2_8_1_2
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Fri, 7 Jun 2013 15:34:09 +0000 (16:34 +0100)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Fri, 7 Jun 2013 15:34:09 +0000 (16:34 +0100)

Trivial merge