Merge branch 'bug/JAL-1230' into Release_2_8_Branch
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Sun, 23 Jun 2013 13:00:05 +0000 (14:00 +0100)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Sun, 23 Jun 2013 13:00:05 +0000 (14:00 +0100)

Trivial merge