Merge branch 'develop' into develop_m2_8_1_2
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Sun, 7 Jul 2013 12:20:30 +0000 (13:20 +0100)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Sun, 7 Jul 2013 12:20:30 +0000 (13:20 +0100)

Trivial merge