Merge branch 'Release_2_8_1_Branch'
authorJim Procter <j.procter@dundee.ac.uk>
Thu, 23 Oct 2014 15:19:46 +0000 (16:19 +0100)
committerJim Procter <j.procter@dundee.ac.uk>
Thu, 23 Oct 2014 15:19:46 +0000 (16:19 +0100)

Trivial merge