Merge branch 'Release_2_8_Branch' into JAL-1199-Stk_writing
authorjprocter <jprocter@compbio.dundee.ac.uk>
Wed, 6 Feb 2013 17:04:23 +0000 (17:04 +0000)
committerjprocter <jprocter@compbio.dundee.ac.uk>
Wed, 6 Feb 2013 17:04:23 +0000 (17:04 +0000)

Trivial merge