Merge branch 'Release_2_8_2_Branch' Release_2_8_2
authorJim Procter <jprocter@dundee.ac.uk>
Wed, 3 Dec 2014 12:03:02 +0000 (12:03 +0000)
committerJim Procter <jprocter@dundee.ac.uk>
Wed, 3 Dec 2014 12:03:02 +0000 (12:03 +0000)

Trivial merge