Merge branch 'JAL-957_jbake' into Release_2_8_Branch
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Tue, 28 Jan 2014 21:23:53 +0000 (21:23 +0000)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Tue, 28 Jan 2014 21:23:53 +0000 (21:23 +0000)

Trivial merge