Merge branch 'JAL-1347' into Release_2_8_Branch
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Thu, 11 Jul 2013 12:57:40 +0000 (13:57 +0100)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Thu, 11 Jul 2013 12:57:40 +0000 (13:57 +0100)

Trivial merge