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

Trivial merge