Merge branch 'develop' into bug/JAL-2346annotationChoice
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 16 Dec 2016 14:40:59 +0000 (14:40 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 16 Dec 2016 14:40:59 +0000 (14:40 +0000)

Trivial merge