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

Trivial merge