Merge branch 'JAL-1286' into Release_2_8_Branch
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Thu, 7 Nov 2013 13:58:31 +0000 (13:58 +0000)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Thu, 7 Nov 2013 13:58:31 +0000 (13:58 +0000)

Trivial merge