Merge branch 'JAL-1353-bugdemo' into Release_2_8_1_Branch
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Tue, 20 Aug 2013 16:28:34 +0000 (17:28 +0100)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Tue, 20 Aug 2013 16:28:34 +0000 (17:28 +0100)

Trivial merge