Merge branch 'Release_2_8_1_Branch'
authorJim Procter <jprocter@dundee.ac.uk>
Wed, 4 Jun 2014 11:52:36 +0000 (12:52 +0100)
committerJim Procter <jprocter@dundee.ac.uk>
Wed, 4 Jun 2014 11:52:36 +0000 (12:52 +0100)

Trivial merge