Merge branch 'jims_marckhacks' into Release_2_8_1_Branch
authorJim Procter <jprocter@dundee.ac.uk>
Wed, 23 Apr 2014 15:37:13 +0000 (16:37 +0100)
committerJim Procter <jprocter@dundee.ac.uk>
Wed, 23 Apr 2014 15:37:13 +0000 (16:37 +0100)

Trivial merge