Merge branch 'try_r20b1_merge' into Release_2_8_1_Branch
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Mon, 3 Feb 2014 17:50:44 +0000 (17:50 +0000)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Mon, 3 Feb 2014 17:50:44 +0000 (17:50 +0000)

Trivial merge