Merge branch 'JAL-957_jbake' into Release_2_8_Branch Release_2_8_Branch
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Wed, 29 Jan 2014 13:26:54 +0000 (13:26 +0000)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Wed, 29 Jan 2014 13:26:54 +0000 (13:26 +0000)

Trivial merge