Merge branch 'features/typed_annotations_calcId' into Release_2_8_2_Branch
authorJim Procter <jprocter@dundee.ac.uk>
Wed, 12 Nov 2014 14:56:16 +0000 (14:56 +0000)
committerJim Procter <jprocter@dundee.ac.uk>
Wed, 12 Nov 2014 14:56:16 +0000 (14:56 +0000)

Trivial merge