Merge branch 'JAL-674_fixannotlabels' into Release_2_8_2_Branch
authorJim Procter <jprocter@dundee.ac.uk>
Wed, 26 Nov 2014 14:52:59 +0000 (14:52 +0000)
committerJim Procter <jprocter@dundee.ac.uk>
Wed, 26 Nov 2014 14:52:59 +0000 (14:52 +0000)

Trivial merge