Merge branch 'Release_2_8_1_Branch'
authorunknown <jprocter@LS30023.ad.lifesci.dundee.ac.uk>
Thu, 23 Oct 2014 21:54:23 +0000 (22:54 +0100)
committerunknown <jprocter@LS30023.ad.lifesci.dundee.ac.uk>
Thu, 23 Oct 2014 21:54:23 +0000 (22:54 +0100)

Trivial merge