Merge branch 'develop' into Release_2_8_2_Branch
authorJim Procter <jprocter@dundee.ac.uk>
Wed, 4 Jun 2014 16:17:13 +0000 (17:17 +0100)
committerJim Procter <jprocter@dundee.ac.uk>
Wed, 4 Jun 2014 16:17:13 +0000 (17:17 +0100)

Trivial merge