Merge branch 'JAL-1378_jb2.1cli' into Release_2_8_1_Branch
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Sat, 5 Oct 2013 14:02:04 +0000 (15:02 +0100)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Sat, 5 Oct 2013 14:02:04 +0000 (15:02 +0100)

Trivial merge