Merge branch 'JAL-643_JAL-1384' into Release_2_8_1_Branch
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Tue, 8 Oct 2013 14:05:11 +0000 (15:05 +0100)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Tue, 8 Oct 2013 14:05:11 +0000 (15:05 +0100)

Trivial merge