Merge branch 'Release_2_8_2_Branch' into Release_2_8_2_Branch_i18n
authorJim Procter <j.procter@dundee.ac.uk>
Mon, 6 Oct 2014 16:29:00 +0000 (17:29 +0100)
committerJim Procter <j.procter@dundee.ac.uk>
Mon, 6 Oct 2014 16:29:00 +0000 (17:29 +0100)

Trivial merge