Merge branch 'master' into develop
authorjprocter <jprocter@compbio.dundee.ac.uk>
Tue, 13 Nov 2012 17:49:01 +0000 (17:49 +0000)
committerjprocter <jprocter@compbio.dundee.ac.uk>
Tue, 13 Nov 2012 17:49:01 +0000 (17:49 +0000)

Trivial merge