Merge branch 'JAL-1347' into Release_2_8_Branch
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Fri, 12 Jul 2013 15:58:47 +0000 (16:58 +0100)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Fri, 12 Jul 2013 15:58:47 +0000 (16:58 +0100)

Trivial merge