Merge branch 'Release_2_8_1_Branch'
authorJim Procter <jprocter@dundee.ac.uk>
Wed, 4 Jun 2014 15:46:17 +0000 (16:46 +0100)
committerJim Procter <jprocter@dundee.ac.uk>
Wed, 4 Jun 2014 15:46:17 +0000 (16:46 +0100)

Trivial merge