Merge branch 'docs/2_8_1_release' into Release_2_8_1_Branch_i18n
authorJim Procter <jprocter@dundee.ac.uk>
Wed, 28 May 2014 14:19:47 +0000 (15:19 +0100)
committerJim Procter <jprocter@dundee.ac.uk>
Wed, 28 May 2014 14:19:47 +0000 (15:19 +0100)

Trivial merge