Merge branch 'Release_2_8_2_Branch_i18n' into Release_2_8_2_Branch
authorJim Procter <j.procter@dundee.ac.uk>
Fri, 3 Oct 2014 13:21:34 +0000 (14:21 +0100)
committerJim Procter <j.procter@dundee.ac.uk>
Fri, 3 Oct 2014 13:21:34 +0000 (14:21 +0100)

Trivial merge