Merge branch 'jims_marckhacks' into Release_2_8_1_Branch
authorJim Procter <jprocter@dundee.ac.uk>
Mon, 21 Apr 2014 13:24:56 +0000 (14:24 +0100)
committerJim Procter <jprocter@dundee.ac.uk>
Mon, 21 Apr 2014 13:24:56 +0000 (14:24 +0100)

Trivial merge