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

Trivial merge