Merge branch 'Release_2_8_2_Branch'
authorJim Procter <jprocter@dundee.ac.uk>
Wed, 3 Dec 2014 10:38:33 +0000 (10:38 +0000)
committerJim Procter <jprocter@dundee.ac.uk>
Wed, 3 Dec 2014 10:38:33 +0000 (10:38 +0000)

Trivial merge