Merge branch 'Release_2_8_2_Branch' into develop
authorJim Procter <jprocter@dundee.ac.uk>
Fri, 6 Jun 2014 14:21:00 +0000 (15:21 +0100)
committerJim Procter <jprocter@dundee.ac.uk>
Fri, 6 Jun 2014 14:21:00 +0000 (15:21 +0100)

Trivial merge