Merge branch 'master' into Release_2_8_Branch
authorjprocter <jprocter@compbio.dundee.ac.uk>
Sat, 17 Nov 2012 21:58:30 +0000 (21:58 +0000)
committerjprocter <jprocter@compbio.dundee.ac.uk>
Sat, 17 Nov 2012 21:58:30 +0000 (21:58 +0000)

Trivial merge